From 2be8cb6730baf9ce903337e72bafd75ee2d5904c Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 20 Jan 2005 22:18:00 +0000 Subject: [PATCH] bitkeeper revision 1.1159.223.7 (41f02e18RcwEdT0BXMaReeOUBf3KVw) timer_tsc.c, time.c: Fix time restore bug. --- linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c | 2 +- .../arch/xen/i386/kernel/timers/timer_tsc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c index 712e0948f1..47eabac205 100644 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/time.c @@ -84,7 +84,7 @@ spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; spinlock_t i8253_lock = SPIN_LOCK_UNLOCKED; EXPORT_SYMBOL(i8253_lock); -extern struct init_timer_opts __initdata timer_tsc_init; +extern struct init_timer_opts timer_tsc_init; extern struct timer_opts timer_tsc; struct timer_opts *cur_timer = &timer_tsc; diff --git a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c index f885505a8b..1947e910ef 100644 --- a/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c +++ b/linux-2.6.10-xen-sparse/arch/xen/i386/kernel/timers/timer_tsc.c @@ -326,7 +326,7 @@ static inline void cpufreq_delayed_get(void) { return; } #endif -static int __init init_tsc(char* override) +static int init_tsc(char* override) { u64 __cpu_khz; @@ -373,7 +373,7 @@ struct timer_opts timer_tsc = { .delay = delay_tsc, }; -struct init_timer_opts __initdata timer_tsc_init = { +struct init_timer_opts timer_tsc_init = { .init = init_tsc, .opts = &timer_tsc, }; -- 2.30.2